From 3fc307a0698ee01c65b572f8ebbff7246bf04ec9 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 1 Oct 2006 20:10:26 +0000 Subject: [PATCH] Same change as to gtkfilesystemunix.c. 2006-10-01 Tor Lillqvist * gtk/gtkfilesystemwin32.c: Same change as to gtkfilesystemunix.c. --- ChangeLog | 4 ++++ gtk/gtkfilesystemwin32.c | 17 ++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae61ee5bd1..e476ffcf3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-10-01 Tor Lillqvist + + * gtk/gtkfilesystemwin32.c: Same change as to gtkfilesystemunix.c. + 2006-09-30 Matthias Clasen * gtk/gtkfilechooserbutton.c (update_combo_box): Protect diff --git a/gtk/gtkfilesystemwin32.c b/gtk/gtkfilesystemwin32.c index f6e7f46b0f..167f56c9bd 100644 --- a/gtk/gtkfilesystemwin32.c +++ b/gtk/gtkfilesystemwin32.c @@ -240,6 +240,7 @@ static GtkFileInfo *create_file_info (GtkFileFolderWin32 *folder_wi const char *mime_type); static gboolean execute_callbacks_idle (gpointer data); +static void execute_callbacks (gpointer data); static gboolean fill_in_names (GtkFileFolderWin32 *folder_win32, GError **error); @@ -460,7 +461,7 @@ gtk_file_system_win32_dispose (GObject *object) system_win32->execute_callbacks_idle_id = 0; /* call pending callbacks */ - execute_callbacks_idle (system_win32); + execute_callbacks (system_win32); } G_OBJECT_CLASS (gtk_file_system_win32_parent_class)->dispose (object); @@ -808,15 +809,13 @@ struct callback_info -static gboolean -execute_callbacks_idle (gpointer data) +static void +execute_callbacks (gpointer data) { GSList *l; gboolean unref_file_system = TRUE; GtkFileSystemWin32 *system_win32 = GTK_FILE_SYSTEM_WIN32 (data); - GDK_THREADS_ENTER (); - if (!system_win32->execute_callbacks_idle_id) unref_file_system = FALSE; else @@ -855,6 +854,14 @@ execute_callbacks_idle (gpointer data) g_object_unref (system_win32); system_win32->execute_callbacks_idle_id = 0; +} + +static gboolean +execute_callbacks_idle (gpointer data) +{ + GDK_THREADS_ENTER (); + + execute_callbacks(data); GDK_THREADS_LEAVE (); -- 2.30.2